# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1153.67.14 -> 1.1153.67.15
#	arch/ia64/kernel/efi.c	1.22    -> 1.23   
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/08/28	tony.luck@intel.com	1.1153.67.15
# [PATCH] ia64: trim.bottom trims the wrong entry
# 
# efi_memmap_walk() repeatedly trims the same
# entry, instead of trimming each of the entries in the granule.
# --------------------------------------------
#
diff -Nru a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c
--- a/arch/ia64/kernel/efi.c	Tue Sep  9 01:05:51 2003
+++ b/arch/ia64/kernel/efi.c	Tue Sep  9 01:05:51 2003
@@ -324,7 +324,7 @@
 				check_md = q;
 
 				if (check_md->attribute & EFI_MEMORY_WB)
-					trim_bottom(md, granule_addr);
+					trim_bottom(check_md, granule_addr);
 
 				if (check_md->phys_addr < granule_addr)
 					continue;